git.neil.brown.name Git - wiggle.git/history

]> git.neil.brown.name Git - wiggle.git/history - vpatch.c

2020-10-03	NeilBrown	Add "wiggle_" prefix to all exported names.	blob \| commitdiff \| raw
2020-10-03	NeilBrown	Move save functions to vpatch.c	blob \| commitdiff \| raw \| diff to current
2020-10-03	NeilBrown	vpatch: make things static that are not shared.	blob \| commitdiff \| raw \| diff to current
2020-09-07	NeilBrown	Add heuristic to take shortcut when too slow.	blob \| commitdiff \| raw \| diff to current
2020-08-29	NeilBrown	vpatch: fix problems reported by valgrind.	blob \| commitdiff \| raw \| diff to current
2019-12-27	NeilBrown	Merge github.com:neilbrown/wiggle	blob \| commitdiff \| raw \| diff to current
2019-12-27	NeilBrown	vpatch: if backups are disabled, don't try to restore.	blob \| commitdiff \| raw \| diff to current
2019-12-27	NeilBrown	vpatch: don't call fileno() on NULL	blob \| commitdiff \| raw \| diff to current
2019-12-27	NeilBrown	vpatch: guard against patch list being empty.	blob \| commitdiff \| raw \| diff to current
2019-12-27	NeilBrown	vpatch: call sort_patches() before main_window().	blob \| commitdiff \| raw \| diff to current
2019-08-03	NeilBrown	Add --no-backup option	blob \| commitdiff \| raw \| diff to current
2019-08-03	NeilBrown	Avoid use of "?:"	blob \| commitdiff \| raw \| diff to current
2019-01-25	NeilBrown	Merge pull request #11 from e7appew/gcc8-format-security	blob \| commitdiff \| raw \| diff to current
2019-01-24	Carlos Maddela	Fix format overflow and truncation warnings with GCC-8.	blob \| commitdiff \| raw \| diff to current
2017-09-29	NeilBrown	Initialize 'o' just in case.	blob \| commitdiff \| raw \| diff to current
2017-09-28	NeilBrown	vpatch: fix build warning	blob \| commitdiff \| raw \| diff to current
2013-10-09	NeilBrown	Merge branch 'master' of https://github.com/seanfarley...	blob \| commitdiff \| raw \| diff to current
2013-10-09	Sean Farley	vpatch: change prepare_merge to a macro for proper c	blob \| commitdiff \| raw \| diff to current
2013-10-09	Sean Farley	vpatch: change find_line to a macro for proper c	blob \| commitdiff \| raw \| diff to current
2013-10-09	Sean Farley	vpatch: change free_stuff to a macro for proper c	blob \| commitdiff \| raw \| diff to current
2013-08-27	NeilBrown	vpatch: avoid warning from gcc-4.4.6	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: avoid unused-variable error from valgrind.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: refine 'c' and 'x' commands.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: remove some more infinite loops.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Hack to improve view of ignore-blank conflicts.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: avoid possible infinite loop.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: discard VTRACE code.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: disable ignore-blanks after editing.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: base tempfile name on that of original file.	blob \| commitdiff \| raw \| diff to current
2013-08-23	NeilBrown	Browser: delete temporary file after reading it back in.	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Update copyright claims.	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Add --output option to redirect output.	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Browser: if editing leaves no conflicts, display diff.	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Browser: pass line number to editor when editting the...	blob \| commitdiff \| raw \| diff to current
2013-08-22	NeilBrown	Browser: edit merge in a temporary file.	blob \| commitdiff \| raw \| diff to current
2013-08-21	NeilBrown	Browser -- support page-up and page-down	blob \| commitdiff \| raw \| diff to current
2013-08-21	NeilBrown	Allow diffs to be browsed.	blob \| commitdiff \| raw \| diff to current
2013-08-21	NeilBrown	Browser: add 'v' to open file in an editor.	blob \| commitdiff \| raw \| diff to current
2013-08-21	NeilBrown	Browser: update all of status line in one place.	blob \| commitdiff \| raw \| diff to current
2013-08-21	NeilBrown	Preserve per-hunk "comment" field.	blob \| commitdiff \| raw \| diff to current
2013-08-21	NeilBrown	vpatch: simplify display of editted mergers.	blob \| commitdiff \| raw \| diff to current
2013-08-20	NeilBrown	Browser: add 'c' command to accept a conflict.	blob \| commitdiff \| raw \| diff to current
2013-08-20	NeilBrown	Make some fatal errors more helpful.	blob \| commitdiff \| raw \| diff to current
2013-08-20	NeilBrown	Browse: make sure 'X' doesn't loop forever searching...	blob \| commitdiff \| raw \| diff to current
2013-08-20	NeilBrown	Allow interactive setting of "--ignore-blanks" flag.	blob \| commitdiff \| raw \| diff to current
2013-08-20	NeilBrown	Browse: suppress "last-key" debugging.	blob \| commitdiff \| raw \| diff to current
2013-08-20	NeilBrown	Browse: allow "--replace" to be requested while viewing.	blob \| commitdiff \| raw \| diff to current
2013-08-20	NeilBrown	Browser: highlight spaces at the end of a line.	blob \| commitdiff \| raw \| diff to current
2013-08-19	NeilBrown	vpatch: discard 'ignored' for 'oldtype'.	blob \| commitdiff \| raw \| diff to current
2013-08-19	NeilBrown	Browser: Don't highlight spaces so much.	blob \| commitdiff \| raw \| diff to current
2013-08-19	NeilBrown	Browser help: add some missing commas.	blob \| commitdiff \| raw \| diff to current
2013-03-08	NeilBrown	merge: calculate number of wiggles more accurately.	blob \| commitdiff \| raw \| diff to current
2013-03-08	NeilBrown	merge: tidy up isolation of conflicts.	blob \| commitdiff \| raw \| diff to current
2013-03-08	NeilBrown	vpatch: restore display for hunk header where appropriate.	blob \| commitdiff \| raw \| diff to current
2013-03-05	NeilBrown	Add --ignore-blanks option.	blob \| commitdiff \| raw \| diff to current
2013-03-01	NeilBrown	vpatch: allow a word to have text before the newline.	blob \| commitdiff \| raw \| diff to current
2013-03-01	NeilBrown	Allow a word to have an unmatched prefix and suffix.	blob \| commitdiff \| raw \| diff to current
2013-03-01	NeilBrown	discard ends_mline, just use ends_line	blob \| commitdiff \| raw \| diff to current
2013-03-01	NeilBrown	vpatch: restructure draw_mside.	blob \| commitdiff \| raw \| diff to current
2013-02-20	NeilBrown	vpatch: fix browse of three-file merge.	blob \| commitdiff \| raw \| diff to current
2013-02-14	NeilBrown	Add valgrind testing of parts of vpatch.	blob \| commitdiff \| raw \| diff to current
2013-02-13	NeilBrown	vpatch: fix another access-beyond-array	blob \| commitdiff \| raw \| diff to current
2013-02-12	NeilBrown	vpatch: allow relevant signals to cause a core-dump.	blob \| commitdiff \| raw \| diff to current
2013-02-12	NeilBrown	vpatch: fix various reference errors found by valgrind.	blob \| commitdiff \| raw \| diff to current
2013-02-07	NeilBrown	Browser: add missing documentation for Save and Restore...	blob \| commitdiff \| raw \| diff to current
2013-02-06	NeilBrown	diff: make rediffing of patches more precise.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: add mouse movement to merge_window.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: add mouse support for main window.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: allow control-C to disable --replace function.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: handle --replace option.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: add X command to ignore all changes in the...	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: make sure render is stable when the merge is...	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: allow changes to be ignored as well as conflict.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: fix display for ignored conflicts.	blob \| commitdiff \| raw \| diff to current
2012-11-15	NeilBrown	vpatch: add "control-X-O" as a watch to change panes.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: allow mode setting keys to toggle back to ...	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: change appearance of ignored conflicts.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: update status counters when we save a file.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: add 'C' command to go to next conflicted hunk.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: highlight conflicts better.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: update display correctly when editing the merge.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: conditionally auto-save unsaved files when...	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: avoid repeated backups.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: prompt to save change if merge was editted.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: allow a save file to be restored.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: support saving of files.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: Allow a message to be displayed in main folder.	blob \| commitdiff \| raw \| diff to current
2012-11-14	NeilBrown	vpatch: remove lots of memory leaks.	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: allow a file in list to be a 'merger' instead...	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: allow conflict to be ignored with 'x'	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: change args to visible()	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: avoid extra blanks when cursor is in alternate...	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: add 'space' and 'backspace' for page up/down.	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: highlight spaces when they might be important.	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: make ctrl-G search-again-forward, not just...	blob \| commitdiff \| raw \| diff to current
2012-11-13	NeilBrown	vpatch: fix check_line to stop at hunk headers.	blob \| commitdiff \| raw \| diff to current
2012-11-12	NeilBrown	vpatch: ensure searching for 'next change' works.	blob \| commitdiff \| raw \| diff to current
2012-11-12	NeilBrown	vpatch: revise the exact meaning of 'CHANGES'.	blob \| commitdiff \| raw \| diff to current
2012-11-12	NeilBrown	vpatch: remove CHANGED	blob \| commitdiff \| raw \| diff to current
2012-11-11	NeilBrown	Browse: ensure we erase all of old type name when updat...	blob \| commitdiff \| raw \| diff to current
next

apply rejected patches and perform word-wise diffs

RSS Atom